Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use ${DOWNLOADS} in lutris.profile #3955

Merged
merged 1 commit into from
Feb 7, 2021
Merged

use ${DOWNLOADS} in lutris.profile #3955

merged 1 commit into from
Feb 7, 2021

Conversation

glitsj16
Copy link
Collaborator

@glitsj16 glitsj16 commented Feb 7, 2021

No description provided.

@glitsj16
Copy link
Collaborator Author

glitsj16 commented Feb 7, 2021

@SkewedZeppelin I just spotted this. Not being familiar with lutris I'm wondering if there is a specific reason for using whitelist ${HOME}/Downloads instead of ${DOWNLOADS}?

Copy link
Collaborator

@SkewedZeppelin SkewedZeppelin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch!

Copy link
Collaborator

@kmk3 kmk3 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Darn, you beat me to it.

I did the same change 4 days ago, but as part of a larger branch.

At least let me do the ${DOCUMENTS} one after this :p

@glitsj16
Copy link
Collaborator Author

glitsj16 commented Feb 7, 2021

@SkewedZeppelin Thanks for the review, much appreciated.

@kmk3

I did the same change 4 days ago, but as part of a larger branch.

Hehe, I stumbled on this by accident, sorry to spoil your party...

At least let me do the ${DOCUMENTS} one after this :p

That's a promise!

@glitsj16 glitsj16 merged commit deae313 into netblue30:master Feb 7, 2021
@glitsj16 glitsj16 deleted the lutris branch February 7, 2021 18:25
@kmk3
Copy link
Collaborator

kmk3 commented Feb 8, 2021

@kmk3

I did the same change 4 days ago, but as part of a larger branch.

Hehe, I stumbled on this by accident, sorry to spoil your party...

It's all good hehe

At least let me do the ${DOCUMENTS} one after this :p

That's a promise!

Much appreciated :)

kmk3 added a commit to kmk3/firejail that referenced this pull request Feb 8, 2021
Currently, some paths are hard-coded:

    $ grep -Fnr '${HOME}/Documents' etc etc-fixes
    etc/profile-m-z/Mathematica.profile:19:mkdir ${HOME}/Documents/Wolfram Mathematica
    etc/profile-m-z/Mathematica.profile:22:whitelist ${HOME}/Documents/Wolfram Mathematica
    etc/profile-a-l/keepassxc.profile:34:# If you do so, you MUST store your database under ${HOME}/Documents/KeePassXC/foo.kdbx
    etc/profile-a-l/keepassxc.profile:35:#mkdir ${HOME}/Documents/KeePassXC
    etc/profile-a-l/keepassxc.profile:36:#whitelist ${HOME}/Documents/KeePassXC

Commands used to search and replace:

    $ find etc etc-fixes/ -type f -exec \
      sed -i.bak -e 's|\${HOME}/Documents|${DOCUMENTS}|' '{}' +

Related to that, the (lack of) usage of ${DOWNLOADS} has been recently
fixed on commit deae313 ("use ${DOWNLOADS} in lutris.profile
(netblue30#3955)").

With that, all macros other than ${DOCUMENTS} seem to be already used
appropriately:

    $ grep -Fnr '${HOME}/Desktop' etc etc-fixes
    $ grep -Fnr '${HOME}/Downloads' etc etc-fixes
    $ grep -Fnr '${HOME}/Music' etc etc-fixes
    $ grep -Fnr '${HOME}/Pictures' etc etc-fixes
    $ grep -Fnr '${HOME}/Videos' etc etc-fixes

See src/firejail/macros.c for details.
kmk3 added a commit to kmk3/firejail that referenced this pull request Feb 8, 2021
Currently, some paths are hard-coded:

    $ grep -Fnr '${HOME}/Documents' etc etc-fixes
    etc/profile-m-z/Mathematica.profile:19:mkdir ${HOME}/Documents/Wolfram Mathematica
    etc/profile-m-z/Mathematica.profile:22:whitelist ${HOME}/Documents/Wolfram Mathematica
    etc/profile-a-l/keepassxc.profile:34:# If you do so, you MUST store your database under ${HOME}/Documents/KeePassXC/foo.kdbx
    etc/profile-a-l/keepassxc.profile:35:#mkdir ${HOME}/Documents/KeePassXC
    etc/profile-a-l/keepassxc.profile:36:#whitelist ${HOME}/Documents/KeePassXC

Commands used to search and replace:

    $ find etc etc-fixes/ -type f -exec \
      sed -i.bak -e 's|\${HOME}/Documents|${DOCUMENTS}|' '{}' +

Related to that, the (lack of) usage of ${DOWNLOADS} has been recently
fixed on commit deae313 ("use ${DOWNLOADS} in lutris.profile
(netblue30#3955)").

With the above change, all macros other than ${DOCUMENTS} seem to be
already used appropriately:

    $ grep -Fnr '${HOME}/Desktop' etc etc-fixes
    $ grep -Fnr '${HOME}/Downloads' etc etc-fixes
    $ grep -Fnr '${HOME}/Music' etc etc-fixes
    $ grep -Fnr '${HOME}/Pictures' etc etc-fixes
    $ grep -Fnr '${HOME}/Videos' etc etc-fixes

See src/firejail/macros.c for details.
@matu3ba matu3ba mentioned this pull request Oct 7, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants